Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 09:19:24 +0000 (02:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 09:19:24 +0000 (02:19 -0700)
commit8fb0267c6d7d6afe9005df06192f8b931b917fce
treed989e03a2d16529b37f02f5f58a68a164ebf893a
parent377d04202382666b0f5e9335e64693bc3f447ff6
parentb2602f45bf14062367c197abd4488b38fd83200e
Merge from trunk.